Support for custom SSH port for KVM hosts from the host url on add host and the configuration #12571

sureshanaparti · 2026-02-03T09:53:37Z

Description

This PR support custom SSH port for KVM hosts from the host url while adding the host and the configuration 'kvm.host.discovery.ssh.port'. The port is used during

KVM host discovery to connect to the Host during Add Host command
Any other operations on host using SSH

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

…m.host.discovery.ssh.port' - Use the custom SSH port for KVM host discovery to connect to the Host during Add Host command - and any other operations on host using SSH

sureshanaparti · 2026-02-03T09:55:16Z

@blueorangutan package

blueorangutan · 2026-02-03T09:58:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

codecov · 2026-02-03T10:01:43Z

Codecov Report

❌ Patch coverage is 9.67742% with 28 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.27%. Comparing base (ce42ce5) to head (9308f02).
⚠️ Report is 7 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...java/com/cloud/agent/manager/AgentManagerImpl.java	0.00%	13 Missing ⚠️
...che/cloudstack/backup/NetworkerBackupProvider.java	0.00%	8 Missing ⚠️
...rvisor/kvm/discoverer/LibvirtServerDiscoverer.java	0.00%	6 Missing ⚠️
...rc/main/java/com/cloud/utils/ssh/SSHCmdHelper.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##               4.20   #12571    +/-   ##
==========================================
  Coverage     16.26%   16.27%            
- Complexity    13428    13435     +7     
==========================================
  Files          5660     5662     +2     
  Lines        499959   500098   +139     
  Branches      60707    60732    +25     
==========================================
+ Hits          81326    81369    +43     
- Misses       409560   409650    +90     
- Partials       9073     9079     +6

Flag	Coverage Δ
uitests	`4.15% <ø> (-0.01%)`	⬇️
unittests	`17.12% <9.67%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

blueorangutan · 2026-02-03T10:58:57Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16684

sureshanaparti · 2026-02-03T11:55:27Z

@blueorangutan test

blueorangutan · 2026-02-03T11:56:05Z

@sureshanaparti a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java

blueorangutan · 2026-02-04T05:05:47Z

[SF] Trillian test result (tid-15362)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 58847 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12571-t15362-kvm-ol8.zip
Smoke tests completed. 141 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java

…er.java

DaanHoogland

clgtm

…that port if passed, other fall back to config 'kvm.host.discovery.ssh.port')

sureshanaparti · 2026-02-10T06:42:49Z

@blueorangutan package

blueorangutan · 2026-02-10T06:44:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

weizhouapache

@sureshanaparti
thanks for the update

just a minor comment: there are two method getHostSshPort, can one of them be removed ?

blueorangutan · 2026-02-10T07:42:37Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16772

sureshanaparti · 2026-02-10T08:00:40Z

@sureshanaparti thanks for the update

just a minor comment: there are two method getHostSshPort, can one of them be removed ?

@weizhouapache better in hostdao, but adding circular dependency with AgentManager. any other thoughts?

weizhouapache · 2026-02-10T08:16:24Z

@sureshanaparti thanks for the update
just a minor comment: there are two method getHostSshPort, can one of them be removed ?

@weizhouapache better in hostdao, but adding circular dependency with AgentManager. any other thoughts?

@sureshanaparti
in AgentManager (definition) and AgentManagerImpl (override) ?

sureshanaparti · 2026-02-10T08:44:43Z

@sureshanaparti in AgentManager (definition) and AgentManagerImpl (override) ?

updated @weizhouapache

sureshanaparti · 2026-02-10T08:45:05Z

@blueorangutan package

blueorangutan · 2026-02-10T08:46:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

sureshanaparti · 2026-02-10T08:49:19Z

@blueorangutan package

blueorangutan · 2026-02-10T08:50:05Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

sureshanaparti · 2026-02-10T08:56:57Z

@blueorangutan package

blueorangutan · 2026-02-10T08:58:04Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-10T10:07:33Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16781

sureshanaparti · 2026-02-10T10:47:42Z

@blueorangutan test

blueorangutan · 2026-02-10T10:50:04Z

@sureshanaparti a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java

nvazquez · 2026-02-11T01:35:35Z

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

+        String hostPort = host.getDetail(Host.HOST_SSH_POST);
+        int sshPort;
+        if (StringUtils.isBlank(hostPort)) {
+            sshPort = KVMHostDiscoverySshPort.valueIn(host.getClusterId());


Just to double check, in case the setting does not have a value on the cluster, will this method return the global set value, or the default value? It should honor the global value, only in case it is not set either, then use default value (22)

yes @nvazquez, when cluster config is not set, it picks from global (which is defaulted to 22).

Looks good, thanks @sureshanaparti

nvazquez · 2026-02-11T01:40:30Z

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

+            return KVMHostDiscoverySshPort.value();
+        }
+
+        _hostDao.loadDetails(host);


Should there be any check for the host hypervisor type? I think this should be only for KVM

this method is called for KVM hypervisor only now, anyways added check to return default ssh port as 22 for other hypervisors.

Great, thanks

blueorangutan · 2026-02-11T01:48:24Z

[SF] Trillian test result (tid-15428)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51023 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr12571-t15428-kvm-ol8.zip
Smoke tests completed. 141 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

sureshanaparti · 2026-02-11T12:44:07Z

@blueorangutan package

blueorangutan · 2026-02-11T12:46:05Z

@sureshanaparti a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-02-11T13:42:17Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 16798

nvazquez · 2026-02-11T13:48:56Z

@blueorangutan test

blueorangutan · 2026-02-11T13:50:04Z

@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

winterhazel

CLGTM

winterhazel · 2026-02-11T15:00:31Z

api/src/main/java/com/cloud/host/Host.java

    String HOST_INSTANCE_CONVERSION = "host.instance.conversion";
    String HOST_OVFTOOL_VERSION = "host.ovftool.version";
    String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
+    String HOST_SSH_POST = "host.ssh.port";


Suggested change

String HOST_SSH_POST = "host.ssh.port";

String HOST_SSH_PORT = "host.ssh.port";

good spot. I think this is an easy win, @sureshanaparti.

winterhazel · 2026-02-11T15:03:02Z

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

+        int sshPort;
+        if (StringUtils.isBlank(hostPort)) {
+            sshPort = KVMHostDiscoverySshPort.valueIn(host.getClusterId());
+        } else {
+            sshPort = Integer.parseInt(hostPort);
+        }
+
+        return sshPort;


Suggested change

int sshPort;

if (StringUtils.isBlank(hostPort)) {

sshPort = KVMHostDiscoverySshPort.valueIn(host.getClusterId());

} else {

sshPort = Integer.parseInt(hostPort);

}

return sshPort;

if (StringUtils.isBlank(hostPort)) {

return KVMHostDiscoverySshPort.valueIn(host.getClusterId());

}

return Integer.parseInt(hostPort);

Just some small refactoring

Support for custom SSH port for KVM hosts using the configuration 'kv…

9692e29

…m.host.discovery.ssh.port' - Use the custom SSH port for KVM host discovery to connect to the Host during Add Host command - and any other operations on host using SSH

boring-cyborg bot added component:agent component:backup component:kvm component:orchestration labels Feb 3, 2026

sureshanaparti added this to the 4.20.3 milestone Feb 3, 2026

sureshanaparti requested review from DaanHoogland and nvazquez February 3, 2026 09:54

sureshanaparti requested a review from abh1sar February 3, 2026 09:59

sureshanaparti added the status:needs-testing label Feb 3, 2026

RosiKyu self-assigned this Feb 3, 2026

winterhazel reviewed Feb 3, 2026

View reviewed changes

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java Show resolved Hide resolved

sureshanaparti commented Feb 4, 2026

View reviewed changes

engine/components-api/src/main/java/com/cloud/agent/AgentManager.java Outdated Show resolved Hide resolved

Update engine/components-api/src/main/java/com/cloud/agent/AgentManag…

2e49b0c

…er.java

DaanHoogland approved these changes Feb 4, 2026

View reviewed changes

nvazquez removed the status:needs-testing label Feb 4, 2026

RosiKyu removed their assignment Feb 5, 2026

nvazquez marked this pull request as draft February 5, 2026 14:19

Pick discovery/ssh port from host url while adding KVM host (and use …

5f4bc91

…that port if passed, other fall back to config 'kvm.host.discovery.ssh.port')

boring-cyborg bot added the component:api label Feb 10, 2026

sureshanaparti marked this pull request as ready for review February 10, 2026 06:41

sureshanaparti changed the title ~~Support for custom SSH port for KVM hosts using the configuration~~ Support for custom SSH port for KVM hosts using the host url on add host and the configuration Feb 10, 2026

sureshanaparti changed the title ~~Support for custom SSH port for KVM hosts using the host url on add host and the configuration~~ Support for custom SSH port for KVM hosts from the host url on add host and the configuration Feb 10, 2026

weizhouapache approved these changes Feb 10, 2026

View reviewed changes

move method getHostSshPort to AgentManager

5347dce

sureshanaparti force-pushed the kvm-custom-ssh-port-support branch from c2de55c to 5347dce Compare February 10, 2026 08:49

weizhouapache reviewed Feb 10, 2026

View reviewed changes

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java Outdated Show resolved Hide resolved

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java Outdated Show resolved Hide resolved

review changes

fa48e90

nvazquez reviewed Feb 11, 2026

View reviewed changes

review comments

9308f02

winterhazel approved these changes Feb 11, 2026

View reviewed changes

	String HOST_SSH_POST = "host.ssh.port";
	String HOST_SSH_PORT = "host.ssh.port";

Support for custom SSH port for KVM hosts from the host url on add host and the configuration #12571

Are you sure you want to change the base?

Support for custom SSH port for KVM hosts from the host url on add host and the configuration #12571

Conversation

sureshanaparti commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

sureshanaparti commented Feb 3, 2026

Uh oh!

blueorangutan commented Feb 3, 2026

Uh oh!

codecov bot commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Feb 3, 2026

Uh oh!

sureshanaparti commented Feb 3, 2026

Uh oh!

blueorangutan commented Feb 3, 2026

Uh oh!

Uh oh!

blueorangutan commented Feb 4, 2026

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

sureshanaparti commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache commented Feb 10, 2026

Uh oh!

sureshanaparti commented Feb 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sureshanaparti commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

sureshanaparti commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

Uh oh!

Uh oh!

sureshanaparti commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

sureshanaparti commented Feb 10, 2026

Uh oh!

blueorangutan commented Feb 10, 2026

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sureshanaparti commented Feb 3, 2026 •

edited

Loading

codecov bot commented Feb 3, 2026 •

edited

Loading

sureshanaparti commented Feb 10, 2026 •

edited

Loading

sureshanaparti commented Feb 10, 2026 •

edited

Loading